From b10319695ffc18bc75d4643f851357e5b1ec256d Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 12 Jan 2011 10:53:56 +0000 Subject: [PATCH] Revert 22706:ca10302ac285 "xenpaging: update machine_to_phys_mapping[] during page deallocation" Crashes during boot, due to m2p tables not being set up early enough. Signed-off-by: Keir Fraser --- xen/common/page_alloc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7e3198c7f9..a3f890f733 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -527,7 +527,7 @@ static int reserve_offlined_page(struct page_info *head) static void free_heap_pages( struct page_info *pg, unsigned int order) { - unsigned long mask, mfn = page_to_mfn(pg); + unsigned long mask; unsigned int i, node = phys_to_nid(page_to_maddr(pg)), tainted = 0; unsigned int zone = page_to_zone(pg); @@ -538,10 +538,6 @@ static void free_heap_pages( for ( i = 0; i < (1 << order); i++ ) { - /* This page is not a guest frame any more. */ - page_set_owner(&pg[i], NULL); /* set_gpfn_from_mfn snoops pg owner */ - set_gpfn_from_mfn(mfn + i, INVALID_M2P_ENTRY); - /* * Cannot assume that count_info == 0, as there are some corner cases * where it isn't the case and yet it isn't a bug: -- 2.30.2